Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Farm build should read server registries.conf #21414

Merged
merged 1 commit into from
Feb 1, 2024

Conversation

umohnani8
Copy link
Member

@umohnani8 umohnani8 commented Jan 29, 2024

Fix the way we set skipTLSVerify on the client side to ensure that the push stage in farm build takes into account the configuration in the farm node's registries.conf when the user hasn't set it on the client side.

Fixes #21352

Does this PR introduce a user-facing change?

Only set skipTLSVerfiy for farm build on client side when changed by user.

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 29, 2024
@rhatdan
Copy link
Member

rhatdan commented Jan 29, 2024

LGTM

@mheon
Copy link
Member

mheon commented Jan 30, 2024

Feels like this could use a test?

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM. I agree that a test would be useful. Can push to a local registry:2 with a registries.conf used by the podman system service.

Copy link
Contributor

openshift-ci bot commented Jan 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: umohnani8, vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [umohnani8,vrothberg]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@umohnani8 umohnani8 force-pushed the farm-reg branch 2 times, most recently from dcfeaf4 to c9a2783 Compare January 31, 2024 17:10
Fix the way we set skipTLSVerify on the client side
to ensure that the push stage in farm build takes into
account the configuration in the farm node's registries.conf
when the user hasn't set it on the client side.

Signed-off-by: Urvashi Mohnani <[email protected]>
@umohnani8
Copy link
Member Author

Added tests and they are green!
@mheon @rhatdan @ashley-cui PTAL

@ashley-cui
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit d8c5893 into containers:main Feb 1, 2024
91 of 92 checks passed
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label May 2, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators May 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman farm support for registries.conf settings
5 participants